mch/admin.py

@@ -186,7 +186,7 @@ class ConsumeInfoSubmitLogInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin):

                 
              

                 
              

                 class ActivityInfoAdmin(admin.ModelAdmin):
              

                -    list_display = ('activity_name', 'start_at', 'end_at', 'status', 'created_at', 'updated_at')
              

                +    list_display = ('activity_name', 'model_uni_names', 'start_at', 'end_at', 'status', 'created_at', 'updated_at')
              

                 
              

                 
              

                 admin.site.register(AdministratorInfo, AdministratorInfoAdmin)
              

mch/models.py

@@ -551,4 +551,4 @@ class ActivityInfo(BaseModelMixin):

                         return unicode(self.pk)
              

                 
              

                     def has_unexpired_activity(self, model_name):
              

                -        return model_name in self.model_uni_names and self.start_at <= tc.utc_datetime() < self.end_at
              

                +        return (self.model_uni_names and model_name in self.model_uni_names) and (self.start_at <= tc.utc_datetime() < self.end_at)